Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 02:07:55 +0000 (18:07 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 02:07:55 +0000 (18:07 -0800)

Trivial merge